From f301108166cd06e24cc8fcfd48d05d6713c54f23 Mon Sep 17 00:00:00 2001 From: "lynx@idefix.cl.cam.ac.uk" Date: Fri, 27 Dec 2002 09:59:37 +0000 Subject: [PATCH] bitkeeper revision 1.7.3.49 (3e0c2489ydVVZ3GITjahg_tKSLWCGA) kmalloc bug fix --- xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_core.c | 4 ++-- xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_memory.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_core.c b/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_core.c index 111ffc52af..d5ebc0d078 100644 --- a/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_core.c +++ b/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_core.c @@ -128,7 +128,7 @@ static void create_proc_dom_entries(int dom) snprintf(dir_name, MAX_LEN, "%s%d", DOM_DIR, dom); - dom_data = (dom_procdata_t *)kmalloc(GFP_KERNEL, 128); + dom_data = (dom_procdata_t *)kmalloc(sizeof(proc_domdata_t), GFP_KERNEL); dom_data->domain = dom; dir = proc_mkdir(dir_name, xeno_base); @@ -215,7 +215,7 @@ static int dom_map_mem(unsigned int dom, unsigned long pfn, int tot_pages) file->nlink = 1; file->proc_fops = &dom_mem_ops; - memdata = (proc_memdata_t *)kmalloc(GFP_KERNEL, sizeof(proc_memdata_t)); + memdata = (proc_memdata_t *)kmalloc(sizeof(proc_memdata_t), GFP_KERNEL); memdata->pfn = pfn; memdata->tot_pages = tot_pages; file->data = memdata; diff --git a/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_memory.c b/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_memory.c index 907f80b400..927f0b1f29 100644 --- a/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_memory.c +++ b/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_memory.c @@ -184,8 +184,8 @@ unsigned long direct_mmap(unsigned long phys_addr, unsigned long size, /* add node on the list of directly mapped areas, make sure the * list remains sorted. */ - //dmmap = (direct_mmap_node_t *)kmalloc(GFP_KERNEL, sizeof(direct_mmap_node_t)); - dmmap = (direct_mmap_node_t *)kmalloc(GFP_KERNEL, KMALLOC_SIZE); + //dmmap = (direct_mmap_node_t *)kmalloc(sizeof(direct_mmap_node_t), GFP_KERNEL); + dmmap = (direct_mmap_node_t *)kmalloc(KMALLOC_SIZE, GFP_KERNEL); dmmap->vm_start = addr; dmmap->vm_end = addr + size; entry = find_direct(¤t->mm->context.direct_list, addr); -- 2.30.2